Updated version 2017.12 from 'upstream/2017.12'
authorSimon McVittie <smcv@debian.org>
Tue, 3 Oct 2017 17:51:45 +0000 (18:51 +0100)
committerSimon McVittie <smcv@debian.org>
Tue, 3 Oct 2017 17:51:45 +0000 (18:51 +0100)
with Debian dir 193fe1e52ee004dc6a5c8e97f67182b793750dab


Trivial merge